Remove definition of NR_PIRQS and replace all uses with

NR_IRQS. Allows removal of redundant check in pirq_guest_bind().

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 5a000448d9245d1ad972f87155198a759d656445..ec67796876aca4e68c1c3fd34f53b5eb350788f8 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -1237,7 +1237,7 @@ static void physdev_init_dom0(struct domain *d)
 {
        if (iomem_permit_access(d, 0UL, ~0UL))
                BUG();
-       if (irqs_permit_access(d, 0, NR_PIRQS-1))
+       if (irqs_permit_access(d, 0, NR_IRQS-1))
                BUG();
 }
 

diff --git a/xen/arch/ia64/xen/irq.c b/xen/arch/ia64/xen/irq.c
index c8f8ec5b9ec95975a08b28d1b2a0fc3be6aa6d25..813eb0dd512af4f87511a5479bfac8372ae0ef59 100644 (file)
--- a/xen/arch/ia64/xen/irq.c
+++ b/xen/arch/ia64/xen/irq.c
@@ -435,9 +435,9 @@ int pirq_guest_unmask(struct domain *d)
     int            irq;
     shared_info_t *s = d->shared_info;
 
-    for ( irq = find_first_bit(d->pirq_mask, NR_PIRQS);
-          irq < NR_PIRQS;
-          irq = find_next_bit(d->pirq_mask, NR_PIRQS, irq+1) )
+    for ( irq = find_first_bit(d->pirq_mask, NR_IRQS);
+          irq < NR_IRQS;
+          irq = find_next_bit(d->pirq_mask, NR_IRQS, irq+1) )
     {
         desc = &irq_desc[irq];
         spin_lock_irq(&desc->lock);

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 6b38f6f0521d990c68ca8452741aff938cd9eb11..ed839787990fcf142fc7bade8fed1d4d1e24adcf 100644 (file)
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -809,7 +809,7 @@ int construct_dom0(struct domain *d,
     /* DOM0 is permitted full I/O capabilities. */
     rc |= ioports_permit_access(dom0, 0, 0xFFFF);
     rc |= iomem_permit_access(dom0, 0UL, ~0UL);
-    rc |= irqs_permit_access(dom0, 0, NR_PIRQS-1);
+    rc |= irqs_permit_access(dom0, 0, NR_IRQS-1);
 
     /*
      * Modify I/O port access permissions.

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index bb4f16cd5a9ae89dc40882dfcc00eb95ede34226..17bab16f9c04a61b69dff1582898125975841625 100644 (file)
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -19,6 +19,7 @@
 #include <asm/bitops.h>
 #include <xen/delay.h>
 #include <asm/apic.h>
+#include <asm/asm_defns.h>
 #include <io_ports.h>
 
 /*

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index c144b9f415f11a51570533577d1a3e129e464d51..58a84d11778b1b192e839a78d58f446fd268d450 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -356,9 +356,9 @@ int pirq_guest_unmask(struct domain *d)
     unsigned int   irq;
     shared_info_t *s = d->shared_info;
 
-    for ( irq = find_first_bit(d->pirq_mask, NR_PIRQS);
-          irq < NR_PIRQS;
-          irq = find_next_bit(d->pirq_mask, NR_PIRQS, irq+1) )
+    for ( irq = find_first_bit(d->pirq_mask, NR_IRQS);
+          irq < NR_IRQS;
+          irq = find_next_bit(d->pirq_mask, NR_IRQS, irq+1) )
     {
         if ( !test_bit(d->pirq_to_evtchn[irq], s->evtchn_mask) )
             __pirq_guest_eoi(d, irq);
@@ -410,9 +410,6 @@ int pirq_guest_bind(struct vcpu *v, int irq, int will_share)
     int                 rc = 0;
     cpumask_t           cpumask = CPU_MASK_NONE;
 
-    if ( (irq < 0) || (irq >= NR_IRQS) )
-        return -EINVAL;
-
  retry:
     vector = irq_to_vector(irq);
     if ( vector == 0 )

diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c
index fb0acc53d8a9a2b86342301a8c0bb74da8ee28bb..64c038c4eefe195eda454ecfe5e1f14757a4ea5a 100644 (file)
--- a/xen/arch/x86/x86_32/traps.c
+++ b/xen/arch/x86/x86_32/traps.c
@@ -243,6 +243,7 @@ unsigned long do_iret(void)
     return regs->eax;
 }
 
+#include <asm/asm_defns.h>
 BUILD_SMP_INTERRUPT(deferred_nmi, TRAP_deferred_nmi)
 fastcall void smp_deferred_nmi(struct cpu_user_regs *regs)
 {

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index a8ae3de2ebed3db349f6b6116ffd2bdc89926b6e..49bb47840b803a7902e796c7e5548560ab2f8a41 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -641,7 +641,7 @@ long do_dom0_op(XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
         unsigned int pirq = op->u.irq_permission.pirq;
 
         ret = -EINVAL;
-        if ( pirq >= NR_PIRQS )
+        if ( pirq >= NR_IRQS )
             break;
 
         ret = -ESRCH;

diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 78cc148aca4a4d9a14b7527188ab62c1cd93aa1c..4d64e53344e62e929c47b04d130ebc582ca551dd 100644 (file)
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -5,7 +5,6 @@
 
 #include <xen/config.h>
 #include <asm/atomic.h>
-#include <asm/asm_defns.h>
 #include <irq_vectors.h>
 
 #define IO_APIC_IRQ(irq)    (((irq) >= 16) || ((1<<(irq)) & io_apic_irqs))

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 84d710a9e583b89343bb8e333c92338e7a4428d9..178697f12ebc37d71a85df9d34c7906e6ce4a90e 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -15,6 +15,7 @@
 #include <xen/rangeset.h>
 #include <asm/domain.h>
 #include <xen/xenoprof.h>
+#include <xen/irq.h>
 
 extern unsigned long volatile jiffies;
 extern rwlock_t domlist_lock;
@@ -132,9 +133,8 @@ struct domain
      * domain's event-channel spinlock. Read accesses can also synchronise on 
      * the lock, but races don't usually matter.
      */
-#define NR_PIRQS 256 /* Put this somewhere sane! */
-    u16              pirq_to_evtchn[NR_PIRQS];
-    DECLARE_BITMAP(pirq_mask, NR_PIRQS);
+    u16              pirq_to_evtchn[NR_IRQS];
+    DECLARE_BITMAP(pirq_mask, NR_IRQS);
 
     /* I/O capabilities (access to IRQs and memory-mapped I/O). */
     struct rangeset *iomem_caps;